Merge remote-tracking branch 'aperezdc/wip'
authorColin Walters <walters@verbum.org>
Wed, 25 Apr 2012 13:56:43 +0000 (09:56 -0400)
committerColin Walters <walters@verbum.org>
Wed, 25 Apr 2012 13:56:43 +0000 (09:56 -0400)

Trivial merge